Remove deterministic picking from query cycle handling#152229
Open
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Open
Remove deterministic picking from query cycle handling#152229Zoxc wants to merge 1 commit intorust-lang:mainfrom
Zoxc wants to merge 1 commit intorust-lang:mainfrom
Conversation
rustbot
added
A-query-system
Contributor
Author
|
cc @nnethercote |
Contributor
|
☔ The latest upstream changes (presumably #152484) made this pull request unmergeable. Please resolve the merge conflicts. |
| let entry_point = entry_points | ||
| .iter() | ||
| .find(|entry_point| entry_point.waiter.is_some()) | ||
| .unwrap_or(entry_points.first().unwrap()); |
Contributor
There was a problem hiding this comment.
Suggested change
| .unwrap_or(entry_points.first().unwrap()); | |
| .unwrap_or(entry_points[0]); |
| if query_in_cycle.parent(query_map).is_none() { | ||
| // This query is connected to the root (it has no query parent) | ||
| Some((span, query, None)) | ||
|
|
Contributor
There was a problem hiding this comment.
Nit: stray empty line.
petrochenkov
added
S-waiting-on-review
Contributor
|
If the existing approach is indeed non-deterministic, then this looks like a good simplification. |
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Feb 14, 2026
rustc_query_impl: Use `ControlFlow` in `visit_waiters` instead of nested options Noticed when reviewing rust-lang#152229.
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Feb 15, 2026
rustc_query_impl: Use `ControlFlow` in `visit_waiters` instead of nested options Noticed when reviewing rust-lang/rust#152229.
nnethercote
approved these changes
Feb 16, 2026
Contributor
|
Good simplification. The r=me after rebasing and with petrochenkov's comments addressed. |
nnethercote
added
S-waiting-on-author
Contributor
Is it worth adding a comment somewhere that mentions this? Seems like useful information. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This removes the deterministic picking of queries from the query cycle handling. The sets we pick from are themselves non-deterministic, making this ineffective. There may be additional entry points to the cycle which we won't discover until after we resume from the cycle handler and run more code.